keyboard: fix D-Bus name acquisition flags to totally block Antler

We never want the antler keyboard to run if gnome-shell is running, so
grab org.gnome.Caribou.Keyboard without the "allow replacement" flag.

https://bugzilla.gnome.org/show_bug.cgi?id=659865

diff --git a/src/main.c b/src/main.c
index 0c505e78b638ca902501a4b0ae0254d87e42411e..503f8a1fc2bb61c24c033d79e27fdc5012ddf527 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -120,7 +120,7 @@ shell_dbus_init (gboolean replace)
   /* ...and the on-screen keyboard service */
   if (!dbus_g_proxy_call (bus, "RequestName", &error,
                           G_TYPE_STRING, "org.gnome.Caribou.Keyboard",
-                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING | request_name_flags,
+                          G_TYPE_UINT, DBUS_NAME_FLAG_REPLACE_EXISTING,
                           G_TYPE_INVALID,
                           G_TYPE_UINT, &request_name_result,
                           G_TYPE_INVALID))